Update from contents of size entry on focus out. (#76493, Lauris

Wed May 15 16:52:57 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkfontsel.c: Update from contents of size entry
        on focus out. (#76493, Lauris Kaplinski)

        * gtk/gtkclipboard.c (selection_get_cb): Fix backwads
        info/time arguments. (#80226)

diff --git a/ChangeLog b/ChangeLog
index 2ade4c3d50067fe1f09501538ea17328374e19d2..e301d0d260492bbb206eb5def9b1d3278e5d8179 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed May 15 16:52:57 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkfontsel.c: Update from contents of size entry
+       on focus out. (#76493, Lauris Kaplinski)
+
+       * gtk/gtkclipboard.c (selection_get_cb): Fix backwads
+       info/time arguments. (#80226)
+
 Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in gtk/stock-icons/Makefile.am: If not

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2ade4c3d50067fe1f09501538ea17328374e19d2..e301d0d260492bbb206eb5def9b1d3278e5d8179 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Wed May 15 16:52:57 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkfontsel.c: Update from contents of size entry
+       on focus out. (#76493, Lauris Kaplinski)
+
+       * gtk/gtkclipboard.c (selection_get_cb): Fix backwads
+       info/time arguments. (#80226)
+
 Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in gtk/stock-icons/Makefile.am: If not

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2ade4c3d50067fe1f09501538ea17328374e19d2..e301d0d260492bbb206eb5def9b1d3278e5d8179 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Wed May 15 16:52:57 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkfontsel.c: Update from contents of size entry
+       on focus out. (#76493, Lauris Kaplinski)
+
+       * gtk/gtkclipboard.c (selection_get_cb): Fix backwads
+       info/time arguments. (#80226)
+
 Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in gtk/stock-icons/Makefile.am: If not

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2ade4c3d50067fe1f09501538ea17328374e19d2..e301d0d260492bbb206eb5def9b1d3278e5d8179 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Wed May 15 16:52:57 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkfontsel.c: Update from contents of size entry
+       on focus out. (#76493, Lauris Kaplinski)
+
+       * gtk/gtkclipboard.c (selection_get_cb): Fix backwads
+       info/time arguments. (#80226)
+
 Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in gtk/stock-icons/Makefile.am: If not

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2ade4c3d50067fe1f09501538ea17328374e19d2..e301d0d260492bbb206eb5def9b1d3278e5d8179 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Wed May 15 16:52:57 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkfontsel.c: Update from contents of size entry
+       on focus out. (#76493, Lauris Kaplinski)
+
+       * gtk/gtkclipboard.c (selection_get_cb): Fix backwads
+       info/time arguments. (#80226)
+
 Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in gtk/stock-icons/Makefile.am: If not

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2ade4c3d50067fe1f09501538ea17328374e19d2..e301d0d260492bbb206eb5def9b1d3278e5d8179 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Wed May 15 16:52:57 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkfontsel.c: Update from contents of size entry
+       on focus out. (#76493, Lauris Kaplinski)
+
+       * gtk/gtkclipboard.c (selection_get_cb): Fix backwads
+       info/time arguments. (#80226)
+
 Wed May 15 11:13:19 2002  Owen Taylor  <otaylor@redhat.com>
 
        * configure.in gtk/stock-icons/Makefile.am: If not

diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 847bb85c4dea019400af7ef838c8d4f789128a96..326560a3af8fce03507b6d02f0d6c2d3eda359ee 100644 (file)
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -179,8 +179,8 @@ gtk_clipboard_get (GdkAtom selection)
 static void 
 selection_get_cb (GtkWidget          *widget,
                  GtkSelectionData   *selection_data,
-                 guint               time,
-                 guint               info)
+                 guint               info,
+                 guint               time)
 {
   GtkClipboard *clipboard = gtk_widget_get_clipboard (widget, selection_data->selection);
 

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 19d4b74816ceae46ee9549a4fc849eacaefc97c3..6307d9d5b200a04ee68a32434149e9833bff7429 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -138,6 +138,9 @@ static void     gtk_font_selection_show_available_sizes  (GtkFontSelection *fs,
                                                          gboolean          first_time);
 static void     gtk_font_selection_size_activate         (GtkWidget        *w,
                                                          gpointer          data);
+static gboolean gtk_font_selection_size_focus_out        (GtkWidget        *w,
+                                                         GdkEventFocus    *event,
+                                                         gpointer          data);
 static void     gtk_font_selection_select_size           (GtkTreeSelection *selection,
                                                          gpointer          data);
 
@@ -322,6 +325,9 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
   gtk_signal_connect (GTK_OBJECT (fontsel->size_entry), "activate",
                      (GtkSignalFunc) gtk_font_selection_size_activate,
                      fontsel);
+  gtk_signal_connect_after (GTK_OBJECT (fontsel->size_entry), "focus_out_event",
+                           (GtkSignalFunc) gtk_font_selection_size_focus_out,
+                           fontsel);
   
   font_label = gtk_label_new_with_mnemonic (_("_Family:"));
   gtk_misc_set_alignment (GTK_MISC (font_label), 0.0, 0.5);
@@ -995,6 +1001,16 @@ gtk_font_selection_size_activate (GtkWidget   *w,
   gtk_font_selection_set_size (fontsel, new_size);
 }
 
+static gboolean
+gtk_font_selection_size_focus_out (GtkWidget     *w,
+                                  GdkEventFocus *event,
+                                  gpointer       data)
+{
+  gtk_font_selection_size_activate (w, data);
+  
+  return TRUE;
+}
+
 /* This is called when a size is selected in the list. */
 static void
 gtk_font_selection_select_size (GtkTreeSelection *selection,